From: Ray Strode <rstrode@redhat.com>
Date: Tue, 6 Oct 2020 14:29:00 +0000 (-0400)
Subject: panel: Disconnect destroy signal handler when needed
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~616^2^2~798
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b41ef2f6e3b2a801331d846ac5fbfd5d349eb4e5;p=gnome-shell.git

panel: Disconnect destroy signal handler when needed

The panel corners try to match their style to the buttons closest
to them. In order to make sure the corner styles stay in sync with
their neighboring buttons, they connect to the style-changed signals
of the buttons.

In order to make sure the style-changed signal handler isn't leaked,
it gets disconnected when the button is destroyed.

Unfortunately, the destroy signal handler connection itself gets leaked!

This commit ensures the destroy signal handler gets disconnected any
time the neighboring button is re-determined.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1460
---

diff --git a/js/ui/panel.js b/js/ui/panel.js
index b168907de..272368a4b 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -591,14 +591,19 @@ class PanelCorner extends St.DrawingArea {
             button = this._findRightmostButton(box);
 
         if (button) {
-            if (this._button && this._buttonStyleChangedSignalId) {
-                this._button.disconnect(this._buttonStyleChangedSignalId);
-                this._button.style = null;
+            if (this._button) {
+                if (this._buttonStyleChangedSignalId) {
+                    this._button.disconnect(this._buttonStyleChangedSignalId);
+                    this._button.style = null;
+                }
+
+                if (this._buttonDestroySignalId)
+                    this._button.disconnect(this._buttonDestroySignalId);
             }
 
             this._button = button;
 
-            button.connect('destroy', () => {
+            this._buttonDestroySignalId = button.connect('destroy', () => {
                 if (this._button == button) {
                     this._button = null;
                     this._buttonStyleChangedSignalId = 0;